Autogenerated HTML docs for v1.9.1-506-g7bf27
diff --git a/git-diff-files.html b/git-diff-files.html index 589a444..f444768 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -1331,7 +1331,7 @@ <p> Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <tt>/dev/null</tt>. The resulting patch - is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is + is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, @@ -2118,7 +2118,7 @@ <div class="paragraph"><p>In the above example output, the function signature was changed from both files (hence two <tt>-</tt> removals from both file1 and file2, plus <tt>++</tt> to mean one line that was added does not appear -in either file1 nor file2). Also eight other lines are the same +in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the
